Change in openvpn[master]: NTLM: increase size of phase 2 response we can handle
A message that is not in the archive (sent off-list or not yet received): gerrit.1705068839000.Iefa4930cb1e8c4135056a17ceb4283fc13cc75c8@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/497?usp=email
to review the following change.
Change subject: NTLM: increase size of phase 2 response we can handle
......................................................................
NTLM: increase size of phase 2 response we can handle
With NTLMv2 the target information buffer can be rather large even with normal domain setups.
In my test setup it was 152 bytes starting at offset 71. Overall the base64 encode phase 2 response was 300 byte long. The linked documentation has 98 bytes at offset 60. 128 byte is clearly too low.
While here improve the error messaging, so that if the buffer is too small at least one can determine that in the log.
---
M src/openvpn/ntlm.c
M src/openvpn/proxy.c
2 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97/497/1
src/openvpn/ntlm.c +8 -8
@@ -205,7 +205,7 @@uint8_t challenge[8 ];int i, ret_val; -uint8_t ntlmv2_response[144 ]; +uint8_t ntlmv2_response[256 ];char userdomain_u[256 ];/* for uppercase unicode username and domain */ char userdomain[128 ];/* the same as previous but ascii */ uint8_t ntlmv2_hash[MD5_DIGEST_LENGTH ];
@@ -255,17 +255,15 @@* the missing bytes will be NULL, as buf2 is known to be zeroed * when this decode happens. */ -uint8_t buf2[128 ];/* decoded reply from proxy */ +uint8_t buf2[512 ];/* decoded reply from proxy */ CLEAR (buf2); ret_val =openvpn_base64_decode (phase_2, buf2,-1 );if (ret_val <0 ) { +msg (M_WARN ,"NTLM: base64 decoding of phase 2 response failed" );return NULL ; } -/* we can be sure that phase_2 is less than 128 -* therefore buf2 needs to be (3/4 * 128) */ -/* extract the challenge from bytes 24-31 */ for (i =0 ; i<8 ; i++) {
@@ -284,7 +282,7 @@ }else { -msg (M_INFO ,"Warning: Username or domain too long" ); +msg (M_INFO ,"NTLM: Username or domain too long" ); }unicodize (userdomain_u, userdomain); gen_hmac_md5((uint8_t *)userdomain_u, 2 * strlen(userdomain), md4_hash,
@@ -319,9 +317,10 @@if ((flags &0x00800000 ) ==0x00800000 ) { tib_len = buf2[0x28 ];/* Get Target Information block size */ -if (tib_len >96 ) +if (tib_len +0x1c +16 >sizeof (ntlmv2_response)) { - tib_len =96 ; +msg (M_WARN ,"NTLM: target information buffer too long for response (len=%d)" , tib_len); +return NULL ; } {
@@ -329,6 +328,7 @@uint8_t tib_pos = buf2[0x2c ];if (tib_pos + tib_len >sizeof (buf2)) { +msg (M_ERR ,"NTLM: phase 2 response from server too long (need %d bytes at offset %u)" , tib_len, tib_pos);return NULL ; }/* Get Target Information block pointer */
src/openvpn/proxy.c +2 -3
@@ -752,8 +752,7 @@ {#if NTLM /* look for the phase 2 response */ -char buf2[129 ]; - +char buf2[512 ];while (true) {if (!recv_line (sd, buf,sizeof (buf),get_server_poll_remaining_time (server_poll_timeout), true,NULL , signal_received))
@@ -764,9 +763,9 @@msg (D_PROXY ,"HTTP proxy returned: '%s'" , buf);char get[80 ]; +CLEAR (buf2);openvpn_snprintf (get,sizeof (get),"%%*s NTLM %%%zus" ,sizeof (buf2) -1 ); nparms =sscanf (buf, get, buf2); - buf2[128 ] =0 ;/* we only need the beginning - ensure it's null terminated. */ /* check for "Proxy-Authenticate: NTLM TlRM..." */ if (nparms ==1 )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/497?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iefa4930cb1e8c4135056a17ceb4283fc13cc75c8
Gerrit-Change-Number: 497
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/497?usp=email )
Change subject: NTLM: increase size of phase 2 response we can handle
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
Looks reasonable. For existing setups that work today, nothing should change, but for long usernames/domains this helps either make it work or see what is happening.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/497?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iefa4930cb1e8c4135056a17ceb4283fc13cc75c8
Gerrit-Change-Number: 497
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 17 Jan 2024 09:08:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 NTLM: increase size of phase 2 response we can handle
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
With NTLMv2 the target information buffer can be rather large even with normal domain setups.
In my test setup it was 152 bytes starting at offset 71. Overall the base64 encode phase 2 response was 300 byte long. The linked documentation has 98 bytes at offset 60. 128 byte is clearly too low.
While here improve the error messaging, so that if the buffer is too small at least one can determine that in the log.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/497
This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/ntlm.c +8 -8
@@ -205,7 +205,7 @@uint8_t challenge[8 ];int i, ret_val; -uint8_t ntlmv2_response[144 ]; +uint8_t ntlmv2_response[256 ];char userdomain_u[256 ];/* for uppercase unicode username and domain */ char userdomain[128 ];/* the same as previous but ascii */ uint8_t ntlmv2_hash[MD5_DIGEST_LENGTH ];
@@ -255,17 +255,15 @@* the missing bytes will be NULL, as buf2 is known to be zeroed * when this decode happens. */ -uint8_t buf2[128 ];/* decoded reply from proxy */ +uint8_t buf2[512 ];/* decoded reply from proxy */ CLEAR (buf2); ret_val =openvpn_base64_decode (phase_2, buf2,-1 );if (ret_val <0 ) { +msg (M_WARN ,"NTLM: base64 decoding of phase 2 response failed" );return NULL ; } -/* we can be sure that phase_2 is less than 128 -* therefore buf2 needs to be (3/4 * 128) */ -/* extract the challenge from bytes 24-31 */ for (i =0 ; i<8 ; i++) {
@@ -284,7 +282,7 @@ }else { -msg (M_INFO ,"Warning: Username or domain too long" ); +msg (M_INFO ,"NTLM: Username or domain too long" ); }unicodize (userdomain_u, userdomain); gen_hmac_md5((uint8_t *)userdomain_u, 2 * strlen(userdomain), md4_hash,
@@ -319,9 +317,10 @@if ((flags &0x00800000 ) ==0x00800000 ) { tib_len = buf2[0x28 ];/* Get Target Information block size */ -if (tib_len >96 ) +if (tib_len +0x1c +16 >sizeof (ntlmv2_response)) { - tib_len =96 ; +msg (M_WARN ,"NTLM: target information buffer too long for response (len=%d)" , tib_len); +return NULL ; } {
@@ -329,6 +328,7 @@uint8_t tib_pos = buf2[0x2c ];if (tib_pos + tib_len >sizeof (buf2)) { +msg (M_ERR ,"NTLM: phase 2 response from server too long (need %d bytes at offset %u)" , tib_len, tib_pos);return NULL ; }/* Get Target Information block pointer */
src/openvpn/proxy.c +2 -3
@@ -752,8 +752,7 @@ {#if NTLM /* look for the phase 2 response */ -char buf2[129 ]; - +char buf2[512 ];while (true) {if (!recv_line (sd, buf,sizeof (buf),get_server_poll_remaining_time (server_poll_timeout), true,NULL , signal_received))
@@ -764,9 +763,9 @@msg (D_PROXY ,"HTTP proxy returned: '%s'" , buf);char get[80 ]; +CLEAR (buf2);openvpn_snprintf (get,sizeof (get),"%%*s NTLM %%%zus" ,sizeof (buf2) -1 ); nparms =sscanf (buf, get, buf2); - buf2[128 ] =0 ;/* we only need the beginning - ensure it's null terminated. */ /* check for "Proxy-Authenticate: NTLM TlRM..." */ if (nparms ==1 )
[Openvpn-devel] [PATCH applied] Re: NTLM: increase size of phase 2 response we can handle
Change seems reasonable. Affects only NTLM stuff, adds better error reporting and takes large domains/usernames into account.
Smoke tested on GHA and buildbot (no NTLM tests right now, though).
Your patch has been applied to the master branch.
release/2.6 is sufficiently different that a separate patch has been posted, which will be handled next :-)
commit d3c9ceecfeab5e34c774b928596ec3c233abc36d (master)
Author: Frank Lichtenheld Date: Wed Jan 17 10:08:39 2024 +0100
NTLM: increase size of phase 2 response we can handle
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28040.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/497?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: NTLM: increase size of phase 2 response we can handle
......................................................................
NTLM: increase size of phase 2 response we can handle
With NTLMv2 the target information buffer can be rather large even with normal domain setups.
In my test setup it was 152 bytes starting at offset 71. Overall the base64 encode phase 2 response was 300 byte long. The linked documentation has 98 bytes at offset 60. 128 byte is clearly too low.
While here improve the error messaging, so that if the buffer is too small at least one can determine that in the log.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28040.html
---
M src/openvpn/ntlm.c
M src/openvpn/proxy.c
2 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97/497/2
src/openvpn/ntlm.c +8 -8
@@ -205,7 +205,7 @@uint8_t challenge[8 ];int i, ret_val; -uint8_t ntlmv2_response[144 ]; +uint8_t ntlmv2_response[256 ];char userdomain_u[256 ];/* for uppercase unicode username and domain */ char userdomain[128 ];/* the same as previous but ascii */ uint8_t ntlmv2_hash[MD5_DIGEST_LENGTH ];
@@ -255,17 +255,15 @@* the missing bytes will be NULL, as buf2 is known to be zeroed * when this decode happens. */ -uint8_t buf2[128 ];/* decoded reply from proxy */ +uint8_t buf2[512 ];/* decoded reply from proxy */ CLEAR (buf2); ret_val =openvpn_base64_decode (phase_2, buf2,-1 );if (ret_val <0 ) { +msg (M_WARN ,"NTLM: base64 decoding of phase 2 response failed" );return NULL ; } -/* we can be sure that phase_2 is less than 128 -* therefore buf2 needs to be (3/4 * 128) */ -/* extract the challenge from bytes 24-31 */ for (i =0 ; i<8 ; i++) {
@@ -284,7 +282,7 @@ }else { -msg (M_INFO ,"Warning: Username or domain too long" ); +msg (M_INFO ,"NTLM: Username or domain too long" ); }unicodize (userdomain_u, userdomain); gen_hmac_md5((uint8_t *)userdomain_u, 2 * strlen(userdomain), md4_hash,
@@ -319,9 +317,10 @@if ((flags &0x00800000 ) ==0x00800000 ) { tib_len = buf2[0x28 ];/* Get Target Information block size */ -if (tib_len >96 ) +if (tib_len +0x1c +16 >sizeof (ntlmv2_response)) { - tib_len =96 ; +msg (M_WARN ,"NTLM: target information buffer too long for response (len=%d)" , tib_len); +return NULL ; } {
@@ -329,6 +328,7 @@uint8_t tib_pos = buf2[0x2c ];if (tib_pos + tib_len >sizeof (buf2)) { +msg (M_ERR ,"NTLM: phase 2 response from server too long (need %d bytes at offset %u)" , tib_len, tib_pos);return NULL ; }/* Get Target Information block pointer */
src/openvpn/proxy.c +2 -3
@@ -752,8 +752,7 @@ {#if NTLM /* look for the phase 2 response */ -char buf2[129 ]; - +char buf2[512 ];while (true) {if (!recv_line (sd, buf,sizeof (buf),get_server_poll_remaining_time (server_poll_timeout), true,NULL , signal_received))
@@ -764,9 +763,9 @@msg (D_PROXY ,"HTTP proxy returned: '%s'" , buf);char get[80 ]; +CLEAR (buf2);openvpn_snprintf (get,sizeof (get),"%%*s NTLM %%%zus" ,sizeof (buf2) -1 ); nparms =sscanf (buf, get, buf2); - buf2[128 ] =0 ;/* we only need the beginning - ensure it's null terminated. */ /* check for "Proxy-Authenticate: NTLM TlRM..." */ if (nparms ==1 )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/497?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iefa4930cb1e8c4135056a17ceb4283fc13cc75c8
Gerrit-Change-Number: 497
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/497?usp=email )
Change subject: NTLM: increase size of phase 2 response we can handle
......................................................................
NTLM: increase size of phase 2 response we can handle
With NTLMv2 the target information buffer can be rather large even with normal domain setups.
In my test setup it was 152 bytes starting at offset 71. Overall the base64 encode phase 2 response was 300 byte long. The linked documentation has 98 bytes at offset 60. 128 byte is clearly too low.
While here improve the error messaging, so that if the buffer is too small at least one can determine that in the log.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28040.html
---
M src/openvpn/ntlm.c
M src/openvpn/proxy.c
2 files changed, 10 insertions(+), 11 deletions(-)
src/openvpn/ntlm.c +8 -8
@@ -205,7 +205,7 @@uint8_t challenge[8 ];int i, ret_val; -uint8_t ntlmv2_response[144 ]; +uint8_t ntlmv2_response[256 ];char userdomain_u[256 ];/* for uppercase unicode username and domain */ char userdomain[128 ];/* the same as previous but ascii */ uint8_t ntlmv2_hash[MD5_DIGEST_LENGTH ];
@@ -255,17 +255,15 @@* the missing bytes will be NULL, as buf2 is known to be zeroed * when this decode happens. */ -uint8_t buf2[128 ];/* decoded reply from proxy */ +uint8_t buf2[512 ];/* decoded reply from proxy */ CLEAR (buf2); ret_val =openvpn_base64_decode (phase_2, buf2,-1 );if (ret_val <0 ) { +msg (M_WARN ,"NTLM: base64 decoding of phase 2 response failed" );return NULL ; } -/* we can be sure that phase_2 is less than 128 -* therefore buf2 needs to be (3/4 * 128) */ -/* extract the challenge from bytes 24-31 */ for (i =0 ; i<8 ; i++) {
@@ -284,7 +282,7 @@ }else { -msg (M_INFO ,"Warning: Username or domain too long" ); +msg (M_INFO ,"NTLM: Username or domain too long" ); }unicodize (userdomain_u, userdomain); gen_hmac_md5((uint8_t *)userdomain_u, 2 * strlen(userdomain), md4_hash,
@@ -319,9 +317,10 @@if ((flags &0x00800000 ) ==0x00800000 ) { tib_len = buf2[0x28 ];/* Get Target Information block size */ -if (tib_len >96 ) +if (tib_len +0x1c +16 >sizeof (ntlmv2_response)) { - tib_len =96 ; +msg (M_WARN ,"NTLM: target information buffer too long for response (len=%d)" , tib_len); +return NULL ; } {
@@ -329,6 +328,7 @@uint8_t tib_pos = buf2[0x2c ];if (tib_pos + tib_len >sizeof (buf2)) { +msg (M_ERR ,"NTLM: phase 2 response from server too long (need %d bytes at offset %u)" , tib_len, tib_pos);return NULL ; }/* Get Target Information block pointer */
src/openvpn/proxy.c +2 -3
@@ -752,8 +752,7 @@ {#if NTLM /* look for the phase 2 response */ -char buf2[129 ]; - +char buf2[512 ];while (true) {if (!recv_line (sd, buf,sizeof (buf),get_server_poll_remaining_time (server_poll_timeout), true,NULL , signal_received))
@@ -764,9 +763,9 @@msg (D_PROXY ,"HTTP proxy returned: '%s'" , buf);char get[80 ]; +CLEAR (buf2);openvpn_snprintf (get,sizeof (get),"%%*s NTLM %%%zus" ,sizeof (buf2) -1 ); nparms =sscanf (buf, get, buf2); - buf2[128 ] =0 ;/* we only need the beginning - ensure it's null terminated. */ /* check for "Proxy-Authenticate: NTLM TlRM..." */ if (nparms ==1 )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/497?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iefa4930cb1e8c4135056a17ceb4283fc13cc75c8
Gerrit-Change-Number: 497
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged